From: Bill Wohler <wohler@newt.com>
Date: Mon, 4 Jul 2011 02:58:14 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~3114^2
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=a9a214a500c4ee09c2c3d6f735389cf96d4870c1;p=emacs.git

Merge from trunk.
---

a9a214a500c4ee09c2c3d6f735389cf96d4870c1